Merge redundant emacs.desktop files and update others from upstream.

diff --git a/debian/changelog b/debian/changelog
index 49a6ae3988a8a079e8d4ebd0c909e66214a612f2..6660863a43471f46e7c2fb85c877c92580700d0b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+emacs23 (23.1+1-4) unstable; urgency=low
+
+  * Remove redundant upstream emacs.desktop files from emacs23-common,
+    and merge some of the upstream emacs.desktop file info into the
+    Debian files.  Thanks to Michael Biebl <biebl@debian.org> for the
+    report. (closes: #541173)
+
+ -- Rob Browning <rlb@defaultvalue.org>  Sat, 05 Sep 2009 21:12:12 -0700
+
 emacs23 (23.1+1-3) unstable; urgency=low
 
   * Fix overlooked manpage rename in emacsVER.postinst.  Thanks to

diff --git a/debian/emacsVER.desktop b/debian/emacsVER.desktop
index 3b43bfb84541515c371a5dc2cc85723712eb87a5..d75070613021538ce57987759e7ebf8b656a14b6 100644 (file)
--- a/debian/emacsVER.desktop
+++ b/debian/emacsVER.desktop
@@ -1,13 +1,13 @@
 [Desktop Entry]
 Version=1.0
 Encoding=UTF-8
-Name=Emacs @MENU_VERSION@ (X11)
-GenericName=Emacs
-Comment=GNU Emacs Text Editor @MENU_VERSION@
-Exec=/usr/bin/@DEB_FLAVOR@
+Name=GNU Emacs @MENU_VERSION@
+GenericName=Text Editor
+Comment=View and edit files
+MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
+Exec=/usr/bin/@DEB_FLAVOR@ %F
 TryExec=@DEB_FLAVOR@
-Terminal=false
-Type=Application
 Icon=/usr/share/icons/hicolor/scalable/apps/@DEB_FLAVOR@.svg
-Categories=Application;Utility;TextEditor;
-MimeType=text/plain
+Type=Application
+Terminal=false
+Categories=Utility;Development;TextEditor;

diff --git a/debian/rules b/debian/rules
index aac637a861c3e4e7a132a1871cc805ee2708dbe0..773cf4a7c3d805ea6db45624074cdc494381811d 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -737,6 +737,9 @@ install: debian/stamp/build $(autogen_install_files)
        cd $(pkgdir_common)/usr/share/icons/hicolor/scalable/mimetypes \
          && mv emacs-document.svg ${flavor}-document.svg
 
+        # Remove redundant emacs.desktop file.
+       rm $(pkgdir_common)/usr/share/emacs/$(runtime_ver)/etc/emacs.desktop
+       rm $(pkgdir_common)/usr/share/applications/emacs.desktop
 
         # Mangle info files.
        chmod 755 debian/mangle-info